Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Fri, 7 May 2010 22:41:48 +0000 (22:41 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Fri, 7 May 2010 22:41:48 +0000 (22:41 +0000)
commite79154a9c778037bcde8abd73a6c671a16e828f0
tree5fb4408bb76fa51f184d9365a1c0615b41ab73cb
parentb2f5f0acc84724a00092a866e83d9d6dcd993302
parent771f1c4127aa7c08d952a015381672054fc4b935
Merge from mainline.